Auto merge of #2276 - alexcrichton:fix-nightly, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 12 Jan 2016 18:48:03 +0000 (18:48 +0000)
committerbors <bors@rust-lang.org>
Tue, 12 Jan 2016 18:48:03 +0000 (18:48 +0000)
Just some tweaks to compiler error messages


Trivial merge